diff --git a/templates/category.html b/templates/category.html
index 8ac5404..1ccb5a5 100644
--- a/templates/category.html
+++ b/templates/category.html
@@ -9,6 +9,6 @@
 {% endif %}
 {% endblock %}
 {% block headnotes %}
-{% if CATEGORY_FEED_ATOM %}&gt; <a href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM|format(category) }}">{{ category }} Category Atom Feed</a>{% endif %}
+&gt; CATEGORY: {{ category }}
 {% endblock %}
 
diff --git a/templates/index.html b/templates/index.html
index a9aa795..d639cf2 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -2,9 +2,8 @@
 {% block content %}
 <header>
   <h3>
-    Index
+    <a href="{{ SITEURL }}">Index</a>
     {% block headnotes %}
-    {% if FEED_ALL_ATOM %}&gt; <a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}">Full Atom Feed</a>{% endif %}
     {% endblock headnotes %}
   </h3>
 </header>
diff --git a/templates/tag.html b/templates/tag.html
index 71fb9b4..878bde4 100644
--- a/templates/tag.html
+++ b/templates/tag.html
@@ -9,5 +9,5 @@
 {% endif %}
 {% endblock %}
 {% block headnotes %}
-{% if TAG_FEED_ATOM %}&gt; <a href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM|format(tag) }}">{{ tag }} Tag Atom Feed</a>{% endif %}
+&gt; TAG: {{ tag }}
 {% endblock %}